Update patches

diff --git a/debian/patches/pyth b/debian/patches/pyth
new file mode 100644 (file)
index 0000000..a21fe55
--- /dev/null
+++ b/debian/patches/pyth
@@ -0,0 +1,84 @@
+Description: <short summary of the patch>
+Author: Johannes Schauer <josch@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2020-11-06
+
+Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake
+===================================================================
+--- vtk9-9.0.1+dfsg1.orig/CMake/vtkModuleWrapPython.cmake
++++ vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake
+@@ -33,8 +33,8 @@ vtk_module_python_default_destination(<v
+   [MAJOR_VERSION <major>])
+ ~~~
+ 
+-By default, the destination is `${CMAKE_INSTALL_BINDIR}/Lib/site-packages` on
+-Windows and `${CMAKE_INSTALL_LIBDIR}/python<VERSION>/site-packages` otherwise.
++By default, the destination is `${CMAKE_INSTALL_BINDIR}/Lib/dist-packages` on
++Windows and `${CMAKE_INSTALL_LIBDIR}/python<VERSION>/dist-packages` otherwise.
+ 
+ `<MAJOR_VERSION>` must be one of `2` or `3`. If not specified, it defaults to
+ the value of `${VTK_PYTHON_VERSION}`.
+@@ -84,7 +84,7 @@ function (vtk_module_python_default_dest
+         "for Python modules.")
+       set(_vtk_python_version_suffix)
+     endif ()
+-    set(destination "${CMAKE_INSTALL_LIBDIR}/python${_vtk_python_version_suffix}/site-packages")
++    set(destination "lib/python3/dist-packages")
+   endif ()
+ 
+   set("${var}" "${destination}" PARENT_SCOPE)
+Index: vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt
+===================================================================
+--- vtk9-9.0.1+dfsg1.orig/Utilities/Python/CMakeLists.txt
++++ vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt
+@@ -77,7 +77,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX)
+     set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages")
+   else ()
+     set(VTK_PYTHON_SITE_PACKAGES_SUFFIX
+-      "python${vtk_python_version_pair}/site-packages")
++      "python3/dist-packages")
+   endif ()
+ endif ()
+Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
+===================================================================
+--- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt
++++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt
+@@ -23,21 +23,21 @@ endif ()
+ 
+ # The interpreters are not supported in wheel builds, so skip them.
+ if (NOT VTK_WHEEL_BUILD)
+-  add_executable(vtkpython
++  add_executable(vtkpython-9.0
+     vtkpython.rc
+     vtkPythonAppInit.cxx)
+-  target_link_libraries(vtkpython
++  target_link_libraries(vtkpython-9.0
+     PRIVATE
+       VTK::WrappingPythonCore
+       VTK::PythonInterpreter
+       VTK::Python
+       VTK::vtkpythonmodules
+       VTK::vtksys)
+-  add_executable(VTK::vtkpython ALIAS vtkpython)
++  add_executable(VTK::vtkpython-9.0 ALIAS vtkpython-9.0)
+   if (VTK_INSTALL_PYTHON_EXES)
+     install(
+-      TARGETS     vtkpython
+-      EXPORT      VTKPython
++      TARGETS     vtkpython-9.0
++      EXPORT      VTK9Python
+       DESTINATION "${CMAKE_INSTALL_BINDIR}")
+   endif ()
+ 
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 8909769632017da2dfa1db2f4e2ec4df712ac269..c9101d4f83e09995aa3081bc2aef3680e677d689 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 #108_Doxygen-use-mathjax.patch
 110_do_not_link_against_socket.patch
 drop_medical_example.patch
+pyth

diff --git a/debian/python3-vtk9.install b/debian/python3-vtk9.install
index 8caa0e1bd3e5e4be84923c01940de18382638d33..684d31a0be516abccd5881f11922925dd1ade525 100644 (file)
--- a/debian/python3-vtk9.install
+++ b/debian/python3-vtk9.install
@@ -1,2 +1,2 @@
 usr/lib/python3
-usr/bin/vtk9python
+usr/bin/vtkpython-9.0

diff --git a/debian/rules b/debian/rules
index cb20e357554eaa92d6340269666e738e732f4292..2aa0b58c99a8cf2b0304c3ecc8b1e0730cded259 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,7 @@ extra_flags +=  \
        -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_theora:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_utf8:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \
        -DVTK_PYTHON_VERSION:STRING=3 \
@@ -78,19 +79,7 @@ override_dh_auto_build-arch:
        dh_auto_build
 
 override_dh_auto_install:
-       pwd
        dh_auto_install -X.pyc -X.pyo
        # Correct headers for paraview
        mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
-       mv $(CURDIR)/debian/tmp/usr/bin/vtkpython $(CURDIR)/debian/tmp/usr/bin/vtk9python
-       mkdir -p $(CURDIR)/debian/tmp/usr/lib/python3
-       mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/python3.9/site-packages $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages 
        sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake
-       chrpath -d $(CURDIR)/debian/tmp/usr/bin/vtk9python
-
-       find $(CURDIR)/debian/tmp/ -name "*.pyc" | xargs rm -f
-       find $(CURDIR)/debian/tmp/ -name "*.pyo" | xargs rm -f
-
-override_dh_install-arch:
-       dh_install -a
-       find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \;